@@ -416,9 +416,11 @@ def activity_signup_info(request):  | 
            ||
| 416 | 416 | 
                 | 
            
| 417 | 417 | 
                try:  | 
            
| 418 | 418 | 
                signup_info = MemberActivitySignupInfo.objects.get(user_id=user_id, activity_id=activity_id, status=True)  | 
            
| 419 | 
                - contribution = MemberActivityContributionInfo.objects.get(user_id=user_id, activity_id=activity_id, content_type=0, status=True)  | 
            |
| 420 | 419 | 
                except MemberActivitySigninInfo.DoesNotExist:  | 
            
| 421 | 420 | 
                return response()  | 
            
| 421 | 
                +  | 
            |
| 422 | 
                + try:  | 
            |
| 423 | 
                + contribution = MemberActivityContributionInfo.objects.get(user_id=user_id, activity_id=activity_id, content_type=0, status=True)  | 
            |
| 422 | 424 | 
                except MemberActivityContributionInfo.DoesNotExist:  | 
            
| 423 | 425 | 
                return response()  | 
            
| 424 | 426 | 
                 | 
            
                @@ -578,6 +580,43 @@ def activity_contribute(request):  | 
            ||
| 578 | 580 | 
                 | 
            
| 579 | 581 | 
                 | 
            
| 580 | 582 | 
                @logit  | 
            
| 583 | 
                +def activity_contribute_update(request):  | 
            |
| 584 | 
                +    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
               | 
            |
| 585 | 
                +    user_id = request.POST.get('user_id', '')
               | 
            |
| 586 | 
                +    activity_id = request.POST.get('activity_id', '')
               | 
            |
| 587 | 
                + content_type = get_query_value(request, 'content_type', val_cast_type='int')  | 
            |
| 588 | 
                +    contribution_id = request.POST.get('contribution_id', '')
               | 
            |
| 589 | 
                +    title = request.POST.get('title', '')
               | 
            |
| 590 | 
                +    content = request.POST.get('content', '')
               | 
            |
| 591 | 
                + images = get_query_value(request, 'images', val_cast_type='listjson')  | 
            |
| 592 | 
                +    video_url = request.POST.get('video_url', '')
               | 
            |
| 593 | 
                +  | 
            |
| 594 | 
                + # 校验用户是否存在  | 
            |
| 595 | 
                + try:  | 
            |
| 596 | 
                + UserInfo.objects.get(user_id=user_id)  | 
            |
| 597 | 
                + except UserInfo.DoesNotExist:  | 
            |
| 598 | 
                + return response(UserStatusCode.USER_NOT_FOUND)  | 
            |
| 599 | 
                +  | 
            |
| 600 | 
                + try:  | 
            |
| 601 | 
                + signup_info = MemberActivitySignupInfo.objects.get(user_id=user_id, activity_id=activity_id, status=True)  | 
            |
| 602 | 
                + except:  | 
            |
| 603 | 
                + signup_info = NULL  | 
            |
| 604 | 
                +  | 
            |
| 605 | 
                +    contribution, _ = MemberActivityContributionInfo.objects.update_or_create(brand_id=brand_id, user_id=user_id, activity_id=activity_id, contribution_id=contribution_id, defaults={
               | 
            |
| 606 | 
                + 'title': title,  | 
            |
| 607 | 
                + 'content': content,  | 
            |
| 608 | 
                + 'images': images,  | 
            |
| 609 | 
                + 'video_url': video_url,  | 
            |
| 610 | 
                + 'user_name': signup_info.name if signup_info else '',  | 
            |
| 611 | 
                + 'user_avatar': signup_info.avatar if signup_info else ''  | 
            |
| 612 | 
                + })  | 
            |
| 613 | 
                +  | 
            |
| 614 | 
                +    return response(data={
               | 
            |
| 615 | 
                + 'contribution': contribution.data,  | 
            |
| 616 | 
                + })  | 
            |
| 617 | 
                +  | 
            |
| 618 | 
                +  | 
            |
| 619 | 
                +@logit  | 
            |
| 581 | 620 | 
                def activity_contribute_list(request):  | 
            
| 582 | 621 | 
                     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
               | 
            
| 583 | 622 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
                @@ -246,6 +246,7 @@ urlpatterns += [  | 
            ||
| 246 | 246 | 
                url(r'^member/activity/signup/info$', member_views.activity_signup_info, name='activity_signup_info'),  | 
            
| 247 | 247 | 
                url(r'^member/activity/contribute$', member_views.activity_contribute, name='member_activity_contribute'),  | 
            
| 248 | 248 | 
                url(r'^member/activity/contribute/list$', member_views.activity_contribute_list, name='member_activity_contribute_list'),  | 
            
| 249 | 
                + url(r'^member/activity/contribute/update$', member_views.activity_contribute_update, name='activity_contribute_update'),  | 
            |
| 249 | 250 | 
                url(r'^member/activity/contribute/detail$', member_views.activity_contribute_detail, name='member_activity_contribute_detail'),  | 
            
| 250 | 251 | 
                 | 
            
| 251 | 252 | 
                url(r'^member/activity/contribute/welfare/unlocking/list$', member_views.activity_contribute_welfare_unlocking_list, name='member_activity_contribute_welfare_unlocking_list'),  |